diff --git a/device-common.mk b/device-common.mk
index d2d2036..c8756d9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -15,16 +15,10 @@
 #
 
 TARGET_KERNEL_DIR ?= device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE)
+TARGET_MODS := $(wildcard $(TARGET_KERNEL_DIR)/*.ko)
 
-TARGET_USES_GKI ?= true
-
-ifeq ($(TARGET_USES_GKI), true)
-  TARGET_MODS := $(wildcard $(TARGET_KERNEL_DIR)/*.ko)
-  ifneq ($(TARGET_MODS),)
-    BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(TARGET_MODS)
-  endif
-endif
+BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(TARGET_MODS)
 
 PRODUCT_SHIPPING_API_LEVEL := 31